From 42ddf48a29d2109e6b33fddd6dafd75e0747fd09 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Fri, 30 Jan 2015 15:58:38 +0000 Subject: [PATCH] build system: stubdom targets now depends on mini-os target Provide mini-os url and revision in Config.mk Make stubdom targets depend on mini-os-dir target. Make subtree-force-update{,-all} depend on mini-os-dir-force-update. Also make mktarball script generate mini-os archive. Original mini-os directory is renamed to mini-os-intree to help reduce patch length. That directory will be deleted in a separate patch. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- Changes in v3: 1. Put mini-os targets in main Makefile. 2. Stubdom clean and distclean don't depend on mini-os-dir. Changes in v2: 1. Use hash in Config.mk. --- .gitignore | 6 ++--- Config.mk | 6 +++++ Makefile | 24 +++++++++++++++---- extras/{mini-os => mini-os-intree}/COPYING | 0 extras/{mini-os => mini-os-intree}/Config.mk | 0 extras/{mini-os => mini-os-intree}/Makefile | 0 extras/{mini-os => mini-os-intree}/README | 0 extras/{mini-os => mini-os-intree}/app.lds | 0 .../arch/arm/arm32.S | 0 .../arch/arm/events.c | 0 .../arch/arm/hypercalls32.S | 0 .../arch/arm/minios-arm32.lds | 0 .../{mini-os => mini-os-intree}/arch/arm/mm.c | 0 .../arch/arm/panic.c | 0 .../arch/arm/sched.c | 0 .../arch/arm/setup.c | 0 .../arch/arm/time.c | 0 .../arch/x86/Makefile | 0 .../arch/x86/arch.mk | 0 .../arch/x86/events.c | 0 .../arch/x86/ioremap.c | 0 .../arch/x86/iorw.c | 0 .../arch/x86/minios-x86_32.lds | 0 .../arch/x86/minios-x86_64.lds | 0 .../{mini-os => mini-os-intree}/arch/x86/mm.c | 0 .../arch/x86/sched.c | 0 .../arch/x86/setup.c | 0 .../arch/x86/time.c | 0 .../arch/x86/traps.c | 0 .../arch/x86/x86_32.S | 0 .../arch/x86/x86_64.S | 0 extras/{mini-os => mini-os-intree}/blkfront.c | 0 .../config/MiniOS.mk | 0 .../config/StdGNU.mk | 0 .../config/arm32.mk | 0 .../config/arm64.mk | 0 .../config/x86_32.mk | 0 .../config/x86_64.mk | 0 .../console/console.c | 0 .../console/console.h | 0 .../console/xenbus.c | 0 .../console/xencons_ring.c | 0 extras/{mini-os => mini-os-intree}/daytime.c | 0 .../{mini-os => mini-os-intree}/domain_config | 0 extras/{mini-os => mini-os-intree}/events.c | 0 extras/{mini-os => mini-os-intree}/fbfront.c | 0 extras/{mini-os => mini-os-intree}/gntmap.c | 0 extras/{mini-os => mini-os-intree}/gnttab.c | 0 .../{mini-os => mini-os-intree}/hypervisor.c | 0 .../include/arch/cc.h | 0 .../include/arch/perf.h | 0 .../include/arch/sys_arch.h | 0 .../include/arm/arch_endian.h | 0 .../include/arm/arch_limits.h | 0 .../include/arm/arch_mm.h | 0 .../include/arm/arch_sched.h | 0 .../include/arm/arch_spinlock.h | 0 .../include/arm/arm32/arch_wordsize.h | 0 .../include/arm/gic.h | 0 .../include/arm/hypercall-arm.h | 0 .../include/arm/os.h | 0 .../include/arm/traps.h | 0 .../include/blkfront.h | 0 .../include/byteorder.h | 0 .../include/byteswap.h | 0 .../include/compiler.h | 0 .../include/console.h | 0 .../include/ctype.h | 0 .../include/endian.h | 0 .../{mini-os => mini-os-intree}/include/err.h | 0 .../include/errno-base.h | 0 .../include/errno.h | 0 .../include/events.h | 0 .../include/fbfront.h | 0 .../include/fcntl.h | 0 .../include/gntmap.h | 0 .../include/gnttab.h | 0 .../include/hypervisor.h | 0 .../include/ioremap.h | 0 .../include/iorw.h | 0 .../include/kernel.h | 0 .../include/lib-gpl.h | 0 .../{mini-os => mini-os-intree}/include/lib.h | 0 .../include/linux/types.h | 0 .../include/lwipopts.h | 0 .../include/minios-external/README | 0 .../include/minios-external/bsd-COPYRIGHT | 0 .../include/minios-external/bsd-queue.3 | 0 .../minios-external/bsd-sys-queue-h-seddery | 0 .../include/minios-external/bsd-sys-queue.h | 0 .../{mini-os => mini-os-intree}/include/mm.h | 0 .../include/netfront.h | 0 .../include/pcifront.h | 0 .../include/posix/arpa/inet.h | 0 .../include/posix/dirent.h | 0 .../include/posix/err.h | 0 .../include/posix/fcntl.h | 0 .../include/posix/limits.h | 0 .../include/posix/net/if.h | 0 .../include/posix/netdb.h | 0 .../include/posix/netinet/in.h | 0 .../include/posix/netinet/tcp.h | 0 .../include/posix/poll.h | 0 .../include/posix/pthread.h | 0 .../include/posix/signal.h | 0 .../include/posix/stdlib.h | 0 .../include/posix/strings.h | 0 .../include/posix/sys/ioctl.h | 0 .../include/posix/sys/mman.h | 0 .../include/posix/sys/poll.h | 0 .../include/posix/sys/select.h | 0 .../include/posix/sys/socket.h | 0 .../include/posix/sys/stat.h | 0 .../include/posix/syslog.h | 0 .../include/posix/termios.h | 0 .../include/posix/time.h | 0 .../include/posix/unistd.h | 0 .../include/sched.h | 0 .../include/semaphore.h | 0 .../include/spinlock.h | 0 .../include/sys/lock.h | 0 .../include/sys/time.h | 0 .../include/time.h | 0 .../include/tpm_tis.h | 0 .../include/tpmback.h | 0 .../include/tpmfront.h | 0 .../include/types.h | 0 .../include/wait.h | 0 .../include/waittypes.h | 0 .../include/x86/arch_endian.h | 0 .../include/x86/arch_limits.h | 0 .../include/x86/arch_mm.h | 0 .../include/x86/arch_sched.h | 0 .../include/x86/arch_spinlock.h | 0 .../include/x86/os.h | 0 .../include/x86/traps.h | 0 .../include/x86/x86_32/arch_wordsize.h | 0 .../include/x86/x86_32/hypercall-x86_32.h | 0 .../include/x86/x86_64/arch_wordsize.h | 0 .../include/x86/x86_64/hypercall-x86_64.h | 0 .../include/xen/COPYING | 0 .../include/xen/arch-arm.h | 0 .../include/xen/arch-arm/hvm/save.h | 0 .../include/xen/arch-x86/cpuid.h | 0 .../include/xen/arch-x86/hvm/save.h | 0 .../include/xen/arch-x86/xen-mca.h | 0 .../include/xen/arch-x86/xen-x86_32.h | 0 .../include/xen/arch-x86/xen-x86_64.h | 0 .../include/xen/arch-x86/xen.h | 0 .../include/xen/arch-x86_32.h | 0 .../include/xen/arch-x86_64.h | 0 .../include/xen/callback.h | 0 .../include/xen/dom0_ops.h | 0 .../include/xen/domctl.h | 0 .../include/xen/elfnote.h | 0 .../include/xen/event_channel.h | 0 .../include/xen/features.h | 0 .../include/xen/gcov.h | 0 .../include/xen/grant_table.h | 0 .../include/xen/hvm/e820.h | 0 .../include/xen/hvm/hvm_info_table.h | 0 .../include/xen/hvm/hvm_op.h | 0 .../include/xen/hvm/hvm_xs_strings.h | 0 .../include/xen/hvm/ioreq.h | 0 .../include/xen/hvm/params.h | 0 .../include/xen/hvm/pvdrivers.h | 0 .../include/xen/hvm/save.h | 0 .../include/xen/io/blkif.h | 0 .../include/xen/io/console.h | 0 .../include/xen/io/fbif.h | 0 .../include/xen/io/fsif.h | 0 .../include/xen/io/kbdif.h | 0 .../include/xen/io/libxenvchan.h | 0 .../include/xen/io/netif.h | 0 .../include/xen/io/pciif.h | 0 .../include/xen/io/protocols.h | 0 .../include/xen/io/ring.h | 0 .../include/xen/io/tpmif.h | 0 .../include/xen/io/usbif.h | 0 .../include/xen/io/vscsiif.h | 0 .../include/xen/io/xenbus.h | 0 .../include/xen/io/xs_wire.h | 0 .../include/xen/kexec.h | 0 .../include/xen/mem_event.h | 0 .../include/xen/memory.h | 0 .../include/xen/nmi.h | 0 .../include/xen/physdev.h | 0 .../include/xen/platform.h | 0 .../include/xen/sched.h | 0 .../include/xen/sysctl.h | 0 .../include/xen/tmem.h | 0 .../include/xen/trace.h | 0 .../include/xen/vcpu.h | 0 .../include/xen/version.h | 0 .../include/xen/xen-compat.h | 0 .../include/xen/xen.h | 0 .../include/xen/xencomm.h | 0 .../include/xen/xenoprof.h | 0 .../include/xen/xsm/flask_op.h | 0 .../include/xenbus.h | 0 .../include/xmalloc.h | 0 extras/{mini-os => mini-os-intree}/kernel.c | 0 .../{mini-os => mini-os-intree}/lib/ctype.c | 0 extras/{mini-os => mini-os-intree}/lib/math.c | 0 .../{mini-os => mini-os-intree}/lib/printf.c | 0 .../lib/stack_chk_fail.c | 0 .../{mini-os => mini-os-intree}/lib/string.c | 0 extras/{mini-os => mini-os-intree}/lib/sys.c | 0 .../{mini-os => mini-os-intree}/lib/xmalloc.c | 0 extras/{mini-os => mini-os-intree}/lib/xs.c | 0 extras/{mini-os => mini-os-intree}/lock.c | 0 .../{mini-os => mini-os-intree}/lwip-arch.c | 0 extras/{mini-os => mini-os-intree}/lwip-net.c | 0 extras/{mini-os => mini-os-intree}/main.c | 0 extras/{mini-os => mini-os-intree}/minios.mk | 0 extras/{mini-os => mini-os-intree}/mm.c | 0 extras/{mini-os => mini-os-intree}/netfront.c | 0 extras/{mini-os => mini-os-intree}/pcifront.c | 0 extras/{mini-os => mini-os-intree}/sched.c | 0 extras/{mini-os => mini-os-intree}/test.c | 0 extras/{mini-os => mini-os-intree}/tpm_tis.c | 0 extras/{mini-os => mini-os-intree}/tpmback.c | 0 extras/{mini-os => mini-os-intree}/tpmfront.c | 0 .../xenbus/xenbus.c | 0 stubdom/Makefile | 4 ++++ tools/misc/mktarball | 4 +++- 226 files changed, 35 insertions(+), 9 deletions(-) rename extras/{mini-os => mini-os-intree}/COPYING (100%) rename extras/{mini-os => mini-os-intree}/Config.mk (100%) rename extras/{mini-os => mini-os-intree}/Makefile (100%) rename extras/{mini-os => mini-os-intree}/README (100%) rename extras/{mini-os => mini-os-intree}/app.lds (100%) rename extras/{mini-os => mini-os-intree}/arch/arm/arm32.S (100%) rename extras/{mini-os => mini-os-intree}/arch/arm/events.c (100%) rename extras/{mini-os => mini-os-intree}/arch/arm/hypercalls32.S (100%) rename extras/{mini-os => mini-os-intree}/arch/arm/minios-arm32.lds (100%) rename extras/{mini-os => mini-os-intree}/arch/arm/mm.c (100%) rename extras/{mini-os => mini-os-intree}/arch/arm/panic.c (100%) rename extras/{mini-os => mini-os-intree}/arch/arm/sched.c (100%) rename extras/{mini-os => mini-os-intree}/arch/arm/setup.c (100%) rename extras/{mini-os => mini-os-intree}/arch/arm/time.c (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/Makefile (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/arch.mk (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/events.c (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/ioremap.c (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/iorw.c (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/minios-x86_32.lds (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/minios-x86_64.lds (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/mm.c (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/sched.c (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/setup.c (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/time.c (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/traps.c (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/x86_32.S (100%) rename extras/{mini-os => mini-os-intree}/arch/x86/x86_64.S (100%) rename extras/{mini-os => mini-os-intree}/blkfront.c (100%) rename extras/{mini-os => mini-os-intree}/config/MiniOS.mk (100%) rename extras/{mini-os => mini-os-intree}/config/StdGNU.mk (100%) rename extras/{mini-os => mini-os-intree}/config/arm32.mk (100%) rename extras/{mini-os => mini-os-intree}/config/arm64.mk (100%) rename extras/{mini-os => mini-os-intree}/config/x86_32.mk (100%) rename extras/{mini-os => mini-os-intree}/config/x86_64.mk (100%) rename extras/{mini-os => mini-os-intree}/console/console.c (100%) rename extras/{mini-os => mini-os-intree}/console/console.h (100%) rename extras/{mini-os => mini-os-intree}/console/xenbus.c (100%) rename extras/{mini-os => mini-os-intree}/console/xencons_ring.c (100%) rename extras/{mini-os => mini-os-intree}/daytime.c (100%) rename extras/{mini-os => mini-os-intree}/domain_config (100%) rename extras/{mini-os => mini-os-intree}/events.c (100%) rename extras/{mini-os => mini-os-intree}/fbfront.c (100%) rename extras/{mini-os => mini-os-intree}/gntmap.c (100%) rename extras/{mini-os => mini-os-intree}/gnttab.c (100%) rename extras/{mini-os => mini-os-intree}/hypervisor.c (100%) rename extras/{mini-os => mini-os-intree}/include/arch/cc.h (100%) rename extras/{mini-os => mini-os-intree}/include/arch/perf.h (100%) rename extras/{mini-os => mini-os-intree}/include/arch/sys_arch.h (100%) rename extras/{mini-os => mini-os-intree}/include/arm/arch_endian.h (100%) rename extras/{mini-os => mini-os-intree}/include/arm/arch_limits.h (100%) rename extras/{mini-os => mini-os-intree}/include/arm/arch_mm.h (100%) rename extras/{mini-os => mini-os-intree}/include/arm/arch_sched.h (100%) rename extras/{mini-os => mini-os-intree}/include/arm/arch_spinlock.h (100%) rename extras/{mini-os => mini-os-intree}/include/arm/arm32/arch_wordsize.h (100%) rename extras/{mini-os => mini-os-intree}/include/arm/gic.h (100%) rename extras/{mini-os => mini-os-intree}/include/arm/hypercall-arm.h (100%) rename extras/{mini-os => mini-os-intree}/include/arm/os.h (100%) rename extras/{mini-os => mini-os-intree}/include/arm/traps.h (100%) rename extras/{mini-os => mini-os-intree}/include/blkfront.h (100%) rename extras/{mini-os => mini-os-intree}/include/byteorder.h (100%) rename extras/{mini-os => mini-os-intree}/include/byteswap.h (100%) rename extras/{mini-os => mini-os-intree}/include/compiler.h (100%) rename extras/{mini-os => mini-os-intree}/include/console.h (100%) rename extras/{mini-os => mini-os-intree}/include/ctype.h (100%) rename extras/{mini-os => mini-os-intree}/include/endian.h (100%) rename extras/{mini-os => mini-os-intree}/include/err.h (100%) rename extras/{mini-os => mini-os-intree}/include/errno-base.h (100%) rename extras/{mini-os => mini-os-intree}/include/errno.h (100%) rename extras/{mini-os => mini-os-intree}/include/events.h (100%) rename extras/{mini-os => mini-os-intree}/include/fbfront.h (100%) rename extras/{mini-os => mini-os-intree}/include/fcntl.h (100%) rename extras/{mini-os => mini-os-intree}/include/gntmap.h (100%) rename extras/{mini-os => mini-os-intree}/include/gnttab.h (100%) rename extras/{mini-os => mini-os-intree}/include/hypervisor.h (100%) rename extras/{mini-os => mini-os-intree}/include/ioremap.h (100%) rename extras/{mini-os => mini-os-intree}/include/iorw.h (100%) rename extras/{mini-os => mini-os-intree}/include/kernel.h (100%) rename extras/{mini-os => mini-os-intree}/include/lib-gpl.h (100%) rename extras/{mini-os => mini-os-intree}/include/lib.h (100%) rename extras/{mini-os => mini-os-intree}/include/linux/types.h (100%) rename extras/{mini-os => mini-os-intree}/include/lwipopts.h (100%) rename extras/{mini-os => mini-os-intree}/include/minios-external/README (100%) rename extras/{mini-os => mini-os-intree}/include/minios-external/bsd-COPYRIGHT (100%) rename extras/{mini-os => mini-os-intree}/include/minios-external/bsd-queue.3 (100%) rename extras/{mini-os => mini-os-intree}/include/minios-external/bsd-sys-queue-h-seddery (100%) rename extras/{mini-os => mini-os-intree}/include/minios-external/bsd-sys-queue.h (100%) rename extras/{mini-os => mini-os-intree}/include/mm.h (100%) rename extras/{mini-os => mini-os-intree}/include/netfront.h (100%) rename extras/{mini-os => mini-os-intree}/include/pcifront.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/arpa/inet.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/dirent.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/err.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/fcntl.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/limits.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/net/if.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/netdb.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/netinet/in.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/netinet/tcp.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/poll.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/pthread.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/signal.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/stdlib.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/strings.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/sys/ioctl.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/sys/mman.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/sys/poll.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/sys/select.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/sys/socket.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/sys/stat.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/syslog.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/termios.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/time.h (100%) rename extras/{mini-os => mini-os-intree}/include/posix/unistd.h (100%) rename extras/{mini-os => mini-os-intree}/include/sched.h (100%) rename extras/{mini-os => mini-os-intree}/include/semaphore.h (100%) rename extras/{mini-os => mini-os-intree}/include/spinlock.h (100%) rename extras/{mini-os => mini-os-intree}/include/sys/lock.h (100%) rename extras/{mini-os => mini-os-intree}/include/sys/time.h (100%) rename extras/{mini-os => mini-os-intree}/include/time.h (100%) rename extras/{mini-os => mini-os-intree}/include/tpm_tis.h (100%) rename extras/{mini-os => mini-os-intree}/include/tpmback.h (100%) rename extras/{mini-os => mini-os-intree}/include/tpmfront.h (100%) rename extras/{mini-os => mini-os-intree}/include/types.h (100%) rename extras/{mini-os => mini-os-intree}/include/wait.h (100%) rename extras/{mini-os => mini-os-intree}/include/waittypes.h (100%) rename extras/{mini-os => mini-os-intree}/include/x86/arch_endian.h (100%) rename extras/{mini-os => mini-os-intree}/include/x86/arch_limits.h (100%) rename extras/{mini-os => mini-os-intree}/include/x86/arch_mm.h (100%) rename extras/{mini-os => mini-os-intree}/include/x86/arch_sched.h (100%) rename extras/{mini-os => mini-os-intree}/include/x86/arch_spinlock.h (100%) rename extras/{mini-os => mini-os-intree}/include/x86/os.h (100%) rename extras/{mini-os => mini-os-intree}/include/x86/traps.h (100%) rename extras/{mini-os => mini-os-intree}/include/x86/x86_32/arch_wordsize.h (100%) rename extras/{mini-os => mini-os-intree}/include/x86/x86_32/hypercall-x86_32.h (100%) rename extras/{mini-os => mini-os-intree}/include/x86/x86_64/arch_wordsize.h (100%) rename extras/{mini-os => mini-os-intree}/include/x86/x86_64/hypercall-x86_64.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/COPYING (100%) rename extras/{mini-os => mini-os-intree}/include/xen/arch-arm.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/arch-arm/hvm/save.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/arch-x86/cpuid.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/arch-x86/hvm/save.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/arch-x86/xen-mca.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/arch-x86/xen-x86_32.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/arch-x86/xen-x86_64.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/arch-x86/xen.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/arch-x86_32.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/arch-x86_64.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/callback.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/dom0_ops.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/domctl.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/elfnote.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/event_channel.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/features.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/gcov.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/grant_table.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/hvm/e820.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/hvm/hvm_info_table.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/hvm/hvm_op.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/hvm/hvm_xs_strings.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/hvm/ioreq.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/hvm/params.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/hvm/pvdrivers.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/hvm/save.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/blkif.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/console.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/fbif.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/fsif.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/kbdif.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/libxenvchan.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/netif.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/pciif.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/protocols.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/ring.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/tpmif.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/usbif.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/vscsiif.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/xenbus.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/io/xs_wire.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/kexec.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/mem_event.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/memory.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/nmi.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/physdev.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/platform.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/sched.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/sysctl.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/tmem.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/trace.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/vcpu.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/version.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/xen-compat.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/xen.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/xencomm.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/xenoprof.h (100%) rename extras/{mini-os => mini-os-intree}/include/xen/xsm/flask_op.h (100%) rename extras/{mini-os => mini-os-intree}/include/xenbus.h (100%) rename extras/{mini-os => mini-os-intree}/include/xmalloc.h (100%) rename extras/{mini-os => mini-os-intree}/kernel.c (100%) rename extras/{mini-os => mini-os-intree}/lib/ctype.c (100%) rename extras/{mini-os => mini-os-intree}/lib/math.c (100%) rename extras/{mini-os => mini-os-intree}/lib/printf.c (100%) rename extras/{mini-os => mini-os-intree}/lib/stack_chk_fail.c (100%) rename extras/{mini-os => mini-os-intree}/lib/string.c (100%) rename extras/{mini-os => mini-os-intree}/lib/sys.c (100%) rename extras/{mini-os => mini-os-intree}/lib/xmalloc.c (100%) rename extras/{mini-os => mini-os-intree}/lib/xs.c (100%) rename extras/{mini-os => mini-os-intree}/lock.c (100%) rename extras/{mini-os => mini-os-intree}/lwip-arch.c (100%) rename extras/{mini-os => mini-os-intree}/lwip-net.c (100%) rename extras/{mini-os => mini-os-intree}/main.c (100%) rename extras/{mini-os => mini-os-intree}/minios.mk (100%) rename extras/{mini-os => mini-os-intree}/mm.c (100%) rename extras/{mini-os => mini-os-intree}/netfront.c (100%) rename extras/{mini-os => mini-os-intree}/pcifront.c (100%) rename extras/{mini-os => mini-os-intree}/sched.c (100%) rename extras/{mini-os => mini-os-intree}/test.c (100%) rename extras/{mini-os => mini-os-intree}/tpm_tis.c (100%) rename extras/{mini-os => mini-os-intree}/tpmback.c (100%) rename extras/{mini-os => mini-os-intree}/tpmfront.c (100%) rename extras/{mini-os => mini-os-intree}/xenbus/xenbus.c (100%) diff --git a/.gitignore b/.gitignore index cdbdca7904..4979018c5e 100644 --- a/.gitignore +++ b/.gitignore @@ -46,10 +46,8 @@ docs/man1/ docs/man5/ docs/pdf/ docs/txt/ -extras/mini-os/include/mini-os -extras/mini-os/include/x86/mini-os -extras/mini-os/include/list.h -extras/mini-os/mini-os* +extras/mini-os +extras/mini-os-remote install/* stubdom/autom4te.cache/ stubdom/binutils-* diff --git a/Config.mk b/Config.mk index d12ad91c6c..109f1f1ef0 100644 --- a/Config.mk +++ b/Config.mk @@ -245,14 +245,20 @@ OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git +MINIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/mini-os.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git +MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 QEMU_UPSTREAM_REVISION ?= master +MINIOS_UPSTREAM_REVISION ?= 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d +# Thu Jan 29 19:10:04 2015 +0000 +# Mini-OS: standalone build + SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. diff --git a/Makefile b/Makefile index ad6f9171ae..e8a75ffb66 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,22 @@ TARGS_DISTCLEAN=$(patsubst %, distclean-%, $(SUBSYSTEMS)) export XEN_ROOT=$(CURDIR) include Config.mk +.PHONY: mini-os-dir +mini-os-dir: + GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \ + $(MINIOS_UPSTREAM_URL) \ + $(MINIOS_UPSTREAM_REVISION) \ + $(XEN_ROOT)/extras/mini-os + +.PHONY: mini-os-dir-force-update +mini-os-dir-force-update: mini-os-dir + set -ex; \ + if [ "$(MINIOS_UPSTREAM_REVISION)" ]; then \ + cd extras/mini-os-remote; \ + $(GIT) fetch origin; \ + $(GIT) reset --hard $(MINIOS_UPSTREAM_REVISION); \ + fi + SUBARCH := $(subst x86_32,i386,$(XEN_TARGET_ARCH)) export XEN_TARGET_ARCH SUBARCH export DESTDIR @@ -37,7 +53,7 @@ build-tools: $(MAKE) -C tools build .PHONY: build-stubdom -build-stubdom: +build-stubdom: mini-os-dir $(MAKE) -C stubdom build ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom pv-grub @@ -84,7 +100,7 @@ install-tools: $(MAKE) -C tools install .PHONY: install-stubdom -install-stubdom: install-tools +install-stubdom: install-tools mini-os-dir $(MAKE) -C stubdom install ifeq (x86_64,$(XEN_TARGET_ARCH)) XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub @@ -125,11 +141,11 @@ rpmball: dist bash ./tools/misc/mkrpm $(XEN_ROOT) $$($(MAKE) -C xen xenversion --no-print-directory) .PHONY: subtree-force-update -subtree-force-update: +subtree-force-update: mini-os-dir-force-update $(MAKE) -C tools subtree-force-update .PHONY: subtree-force-update-all -subtree-force-update-all: +subtree-force-update-all: mini-os-dir-force-update $(MAKE) -C tools subtree-force-update-all # Make a source tarball, including qemu sub-trees. diff --git a/extras/mini-os/COPYING b/extras/mini-os-intree/COPYING similarity index 100% rename from extras/mini-os/COPYING rename to extras/mini-os-intree/COPYING diff --git a/extras/mini-os/Config.mk b/extras/mini-os-intree/Config.mk similarity index 100% rename from extras/mini-os/Config.mk rename to extras/mini-os-intree/Config.mk diff --git a/extras/mini-os/Makefile b/extras/mini-os-intree/Makefile similarity index 100% rename from extras/mini-os/Makefile rename to extras/mini-os-intree/Makefile diff --git a/extras/mini-os/README b/extras/mini-os-intree/README similarity index 100% rename from extras/mini-os/README rename to extras/mini-os-intree/README diff --git a/extras/mini-os/app.lds b/extras/mini-os-intree/app.lds similarity index 100% rename from extras/mini-os/app.lds rename to extras/mini-os-intree/app.lds diff --git a/extras/mini-os/arch/arm/arm32.S b/extras/mini-os-intree/arch/arm/arm32.S similarity index 100% rename from extras/mini-os/arch/arm/arm32.S rename to extras/mini-os-intree/arch/arm/arm32.S diff --git a/extras/mini-os/arch/arm/events.c b/extras/mini-os-intree/arch/arm/events.c similarity index 100% rename from extras/mini-os/arch/arm/events.c rename to extras/mini-os-intree/arch/arm/events.c diff --git a/extras/mini-os/arch/arm/hypercalls32.S b/extras/mini-os-intree/arch/arm/hypercalls32.S similarity index 100% rename from extras/mini-os/arch/arm/hypercalls32.S rename to extras/mini-os-intree/arch/arm/hypercalls32.S diff --git a/extras/mini-os/arch/arm/minios-arm32.lds b/extras/mini-os-intree/arch/arm/minios-arm32.lds similarity index 100% rename from extras/mini-os/arch/arm/minios-arm32.lds rename to extras/mini-os-intree/arch/arm/minios-arm32.lds diff --git a/extras/mini-os/arch/arm/mm.c b/extras/mini-os-intree/arch/arm/mm.c similarity index 100% rename from extras/mini-os/arch/arm/mm.c rename to extras/mini-os-intree/arch/arm/mm.c diff --git a/extras/mini-os/arch/arm/panic.c b/extras/mini-os-intree/arch/arm/panic.c similarity index 100% rename from extras/mini-os/arch/arm/panic.c rename to extras/mini-os-intree/arch/arm/panic.c diff --git a/extras/mini-os/arch/arm/sched.c b/extras/mini-os-intree/arch/arm/sched.c similarity index 100% rename from extras/mini-os/arch/arm/sched.c rename to extras/mini-os-intree/arch/arm/sched.c diff --git a/extras/mini-os/arch/arm/setup.c b/extras/mini-os-intree/arch/arm/setup.c similarity index 100% rename from extras/mini-os/arch/arm/setup.c rename to extras/mini-os-intree/arch/arm/setup.c diff --git a/extras/mini-os/arch/arm/time.c b/extras/mini-os-intree/arch/arm/time.c similarity index 100% rename from extras/mini-os/arch/arm/time.c rename to extras/mini-os-intree/arch/arm/time.c diff --git a/extras/mini-os/arch/x86/Makefile b/extras/mini-os-intree/arch/x86/Makefile similarity index 100% rename from extras/mini-os/arch/x86/Makefile rename to extras/mini-os-intree/arch/x86/Makefile diff --git a/extras/mini-os/arch/x86/arch.mk b/extras/mini-os-intree/arch/x86/arch.mk similarity index 100% rename from extras/mini-os/arch/x86/arch.mk rename to extras/mini-os-intree/arch/x86/arch.mk diff --git a/extras/mini-os/arch/x86/events.c b/extras/mini-os-intree/arch/x86/events.c similarity index 100% rename from extras/mini-os/arch/x86/events.c rename to extras/mini-os-intree/arch/x86/events.c diff --git a/extras/mini-os/arch/x86/ioremap.c b/extras/mini-os-intree/arch/x86/ioremap.c similarity index 100% rename from extras/mini-os/arch/x86/ioremap.c rename to extras/mini-os-intree/arch/x86/ioremap.c diff --git a/extras/mini-os/arch/x86/iorw.c b/extras/mini-os-intree/arch/x86/iorw.c similarity index 100% rename from extras/mini-os/arch/x86/iorw.c rename to extras/mini-os-intree/arch/x86/iorw.c diff --git a/extras/mini-os/arch/x86/minios-x86_32.lds b/extras/mini-os-intree/arch/x86/minios-x86_32.lds similarity index 100% rename from extras/mini-os/arch/x86/minios-x86_32.lds rename to extras/mini-os-intree/arch/x86/minios-x86_32.lds diff --git a/extras/mini-os/arch/x86/minios-x86_64.lds b/extras/mini-os-intree/arch/x86/minios-x86_64.lds similarity index 100% rename from extras/mini-os/arch/x86/minios-x86_64.lds rename to extras/mini-os-intree/arch/x86/minios-x86_64.lds diff --git a/extras/mini-os/arch/x86/mm.c b/extras/mini-os-intree/arch/x86/mm.c similarity index 100% rename from extras/mini-os/arch/x86/mm.c rename to extras/mini-os-intree/arch/x86/mm.c diff --git a/extras/mini-os/arch/x86/sched.c b/extras/mini-os-intree/arch/x86/sched.c similarity index 100% rename from extras/mini-os/arch/x86/sched.c rename to extras/mini-os-intree/arch/x86/sched.c diff --git a/extras/mini-os/arch/x86/setup.c b/extras/mini-os-intree/arch/x86/setup.c similarity index 100% rename from extras/mini-os/arch/x86/setup.c rename to extras/mini-os-intree/arch/x86/setup.c diff --git a/extras/mini-os/arch/x86/time.c b/extras/mini-os-intree/arch/x86/time.c similarity index 100% rename from extras/mini-os/arch/x86/time.c rename to extras/mini-os-intree/arch/x86/time.c diff --git a/extras/mini-os/arch/x86/traps.c b/extras/mini-os-intree/arch/x86/traps.c similarity index 100% rename from extras/mini-os/arch/x86/traps.c rename to extras/mini-os-intree/arch/x86/traps.c diff --git a/extras/mini-os/arch/x86/x86_32.S b/extras/mini-os-intree/arch/x86/x86_32.S similarity index 100% rename from extras/mini-os/arch/x86/x86_32.S rename to extras/mini-os-intree/arch/x86/x86_32.S diff --git a/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os-intree/arch/x86/x86_64.S similarity index 100% rename from extras/mini-os/arch/x86/x86_64.S rename to extras/mini-os-intree/arch/x86/x86_64.S diff --git a/extras/mini-os/blkfront.c b/extras/mini-os-intree/blkfront.c similarity index 100% rename from extras/mini-os/blkfront.c rename to extras/mini-os-intree/blkfront.c diff --git a/extras/mini-os/config/MiniOS.mk b/extras/mini-os-intree/config/MiniOS.mk similarity index 100% rename from extras/mini-os/config/MiniOS.mk rename to extras/mini-os-intree/config/MiniOS.mk diff --git a/extras/mini-os/config/StdGNU.mk b/extras/mini-os-intree/config/StdGNU.mk similarity index 100% rename from extras/mini-os/config/StdGNU.mk rename to extras/mini-os-intree/config/StdGNU.mk diff --git a/extras/mini-os/config/arm32.mk b/extras/mini-os-intree/config/arm32.mk similarity index 100% rename from extras/mini-os/config/arm32.mk rename to extras/mini-os-intree/config/arm32.mk diff --git a/extras/mini-os/config/arm64.mk b/extras/mini-os-intree/config/arm64.mk similarity index 100% rename from extras/mini-os/config/arm64.mk rename to extras/mini-os-intree/config/arm64.mk diff --git a/extras/mini-os/config/x86_32.mk b/extras/mini-os-intree/config/x86_32.mk similarity index 100% rename from extras/mini-os/config/x86_32.mk rename to extras/mini-os-intree/config/x86_32.mk diff --git a/extras/mini-os/config/x86_64.mk b/extras/mini-os-intree/config/x86_64.mk similarity index 100% rename from extras/mini-os/config/x86_64.mk rename to extras/mini-os-intree/config/x86_64.mk diff --git a/extras/mini-os/console/console.c b/extras/mini-os-intree/console/console.c similarity index 100% rename from extras/mini-os/console/console.c rename to extras/mini-os-intree/console/console.c diff --git a/extras/mini-os/console/console.h b/extras/mini-os-intree/console/console.h similarity index 100% rename from extras/mini-os/console/console.h rename to extras/mini-os-intree/console/console.h diff --git a/extras/mini-os/console/xenbus.c b/extras/mini-os-intree/console/xenbus.c similarity index 100% rename from extras/mini-os/console/xenbus.c rename to extras/mini-os-intree/console/xenbus.c diff --git a/extras/mini-os/console/xencons_ring.c b/extras/mini-os-intree/console/xencons_ring.c similarity index 100% rename from extras/mini-os/console/xencons_ring.c rename to extras/mini-os-intree/console/xencons_ring.c diff --git a/extras/mini-os/daytime.c b/extras/mini-os-intree/daytime.c similarity index 100% rename from extras/mini-os/daytime.c rename to extras/mini-os-intree/daytime.c diff --git a/extras/mini-os/domain_config b/extras/mini-os-intree/domain_config similarity index 100% rename from extras/mini-os/domain_config rename to extras/mini-os-intree/domain_config diff --git a/extras/mini-os/events.c b/extras/mini-os-intree/events.c similarity index 100% rename from extras/mini-os/events.c rename to extras/mini-os-intree/events.c diff --git a/extras/mini-os/fbfront.c b/extras/mini-os-intree/fbfront.c similarity index 100% rename from extras/mini-os/fbfront.c rename to extras/mini-os-intree/fbfront.c diff --git a/extras/mini-os/gntmap.c b/extras/mini-os-intree/gntmap.c similarity index 100% rename from extras/mini-os/gntmap.c rename to extras/mini-os-intree/gntmap.c diff --git a/extras/mini-os/gnttab.c b/extras/mini-os-intree/gnttab.c similarity index 100% rename from extras/mini-os/gnttab.c rename to extras/mini-os-intree/gnttab.c diff --git a/extras/mini-os/hypervisor.c b/extras/mini-os-intree/hypervisor.c similarity index 100% rename from extras/mini-os/hypervisor.c rename to extras/mini-os-intree/hypervisor.c diff --git a/extras/mini-os/include/arch/cc.h b/extras/mini-os-intree/include/arch/cc.h similarity index 100% rename from extras/mini-os/include/arch/cc.h rename to extras/mini-os-intree/include/arch/cc.h diff --git a/extras/mini-os/include/arch/perf.h b/extras/mini-os-intree/include/arch/perf.h similarity index 100% rename from extras/mini-os/include/arch/perf.h rename to extras/mini-os-intree/include/arch/perf.h diff --git a/extras/mini-os/include/arch/sys_arch.h b/extras/mini-os-intree/include/arch/sys_arch.h similarity index 100% rename from extras/mini-os/include/arch/sys_arch.h rename to extras/mini-os-intree/include/arch/sys_arch.h diff --git a/extras/mini-os/include/arm/arch_endian.h b/extras/mini-os-intree/include/arm/arch_endian.h similarity index 100% rename from extras/mini-os/include/arm/arch_endian.h rename to extras/mini-os-intree/include/arm/arch_endian.h diff --git a/extras/mini-os/include/arm/arch_limits.h b/extras/mini-os-intree/include/arm/arch_limits.h similarity index 100% rename from extras/mini-os/include/arm/arch_limits.h rename to extras/mini-os-intree/include/arm/arch_limits.h diff --git a/extras/mini-os/include/arm/arch_mm.h b/extras/mini-os-intree/include/arm/arch_mm.h similarity index 100% rename from extras/mini-os/include/arm/arch_mm.h rename to extras/mini-os-intree/include/arm/arch_mm.h diff --git a/extras/mini-os/include/arm/arch_sched.h b/extras/mini-os-intree/include/arm/arch_sched.h similarity index 100% rename from extras/mini-os/include/arm/arch_sched.h rename to extras/mini-os-intree/include/arm/arch_sched.h diff --git a/extras/mini-os/include/arm/arch_spinlock.h b/extras/mini-os-intree/include/arm/arch_spinlock.h similarity index 100% rename from extras/mini-os/include/arm/arch_spinlock.h rename to extras/mini-os-intree/include/arm/arch_spinlock.h diff --git a/extras/mini-os/include/arm/arm32/arch_wordsize.h b/extras/mini-os-intree/include/arm/arm32/arch_wordsize.h similarity index 100% rename from extras/mini-os/include/arm/arm32/arch_wordsize.h rename to extras/mini-os-intree/include/arm/arm32/arch_wordsize.h diff --git a/extras/mini-os/include/arm/gic.h b/extras/mini-os-intree/include/arm/gic.h similarity index 100% rename from extras/mini-os/include/arm/gic.h rename to extras/mini-os-intree/include/arm/gic.h diff --git a/extras/mini-os/include/arm/hypercall-arm.h b/extras/mini-os-intree/include/arm/hypercall-arm.h similarity index 100% rename from extras/mini-os/include/arm/hypercall-arm.h rename to extras/mini-os-intree/include/arm/hypercall-arm.h diff --git a/extras/mini-os/include/arm/os.h b/extras/mini-os-intree/include/arm/os.h similarity index 100% rename from extras/mini-os/include/arm/os.h rename to extras/mini-os-intree/include/arm/os.h diff --git a/extras/mini-os/include/arm/traps.h b/extras/mini-os-intree/include/arm/traps.h similarity index 100% rename from extras/mini-os/include/arm/traps.h rename to extras/mini-os-intree/include/arm/traps.h diff --git a/extras/mini-os/include/blkfront.h b/extras/mini-os-intree/include/blkfront.h similarity index 100% rename from extras/mini-os/include/blkfront.h rename to extras/mini-os-intree/include/blkfront.h diff --git a/extras/mini-os/include/byteorder.h b/extras/mini-os-intree/include/byteorder.h similarity index 100% rename from extras/mini-os/include/byteorder.h rename to extras/mini-os-intree/include/byteorder.h diff --git a/extras/mini-os/include/byteswap.h b/extras/mini-os-intree/include/byteswap.h similarity index 100% rename from extras/mini-os/include/byteswap.h rename to extras/mini-os-intree/include/byteswap.h diff --git a/extras/mini-os/include/compiler.h b/extras/mini-os-intree/include/compiler.h similarity index 100% rename from extras/mini-os/include/compiler.h rename to extras/mini-os-intree/include/compiler.h diff --git a/extras/mini-os/include/console.h b/extras/mini-os-intree/include/console.h similarity index 100% rename from extras/mini-os/include/console.h rename to extras/mini-os-intree/include/console.h diff --git a/extras/mini-os/include/ctype.h b/extras/mini-os-intree/include/ctype.h similarity index 100% rename from extras/mini-os/include/ctype.h rename to extras/mini-os-intree/include/ctype.h diff --git a/extras/mini-os/include/endian.h b/extras/mini-os-intree/include/endian.h similarity index 100% rename from extras/mini-os/include/endian.h rename to extras/mini-os-intree/include/endian.h diff --git a/extras/mini-os/include/err.h b/extras/mini-os-intree/include/err.h similarity index 100% rename from extras/mini-os/include/err.h rename to extras/mini-os-intree/include/err.h diff --git a/extras/mini-os/include/errno-base.h b/extras/mini-os-intree/include/errno-base.h similarity index 100% rename from extras/mini-os/include/errno-base.h rename to extras/mini-os-intree/include/errno-base.h diff --git a/extras/mini-os/include/errno.h b/extras/mini-os-intree/include/errno.h similarity index 100% rename from extras/mini-os/include/errno.h rename to extras/mini-os-intree/include/errno.h diff --git a/extras/mini-os/include/events.h b/extras/mini-os-intree/include/events.h similarity index 100% rename from extras/mini-os/include/events.h rename to extras/mini-os-intree/include/events.h diff --git a/extras/mini-os/include/fbfront.h b/extras/mini-os-intree/include/fbfront.h similarity index 100% rename from extras/mini-os/include/fbfront.h rename to extras/mini-os-intree/include/fbfront.h diff --git a/extras/mini-os/include/fcntl.h b/extras/mini-os-intree/include/fcntl.h similarity index 100% rename from extras/mini-os/include/fcntl.h rename to extras/mini-os-intree/include/fcntl.h diff --git a/extras/mini-os/include/gntmap.h b/extras/mini-os-intree/include/gntmap.h similarity index 100% rename from extras/mini-os/include/gntmap.h rename to extras/mini-os-intree/include/gntmap.h diff --git a/extras/mini-os/include/gnttab.h b/extras/mini-os-intree/include/gnttab.h similarity index 100% rename from extras/mini-os/include/gnttab.h rename to extras/mini-os-intree/include/gnttab.h diff --git a/extras/mini-os/include/hypervisor.h b/extras/mini-os-intree/include/hypervisor.h similarity index 100% rename from extras/mini-os/include/hypervisor.h rename to extras/mini-os-intree/include/hypervisor.h diff --git a/extras/mini-os/include/ioremap.h b/extras/mini-os-intree/include/ioremap.h similarity index 100% rename from extras/mini-os/include/ioremap.h rename to extras/mini-os-intree/include/ioremap.h diff --git a/extras/mini-os/include/iorw.h b/extras/mini-os-intree/include/iorw.h similarity index 100% rename from extras/mini-os/include/iorw.h rename to extras/mini-os-intree/include/iorw.h diff --git a/extras/mini-os/include/kernel.h b/extras/mini-os-intree/include/kernel.h similarity index 100% rename from extras/mini-os/include/kernel.h rename to extras/mini-os-intree/include/kernel.h diff --git a/extras/mini-os/include/lib-gpl.h b/extras/mini-os-intree/include/lib-gpl.h similarity index 100% rename from extras/mini-os/include/lib-gpl.h rename to extras/mini-os-intree/include/lib-gpl.h diff --git a/extras/mini-os/include/lib.h b/extras/mini-os-intree/include/lib.h similarity index 100% rename from extras/mini-os/include/lib.h rename to extras/mini-os-intree/include/lib.h diff --git a/extras/mini-os/include/linux/types.h b/extras/mini-os-intree/include/linux/types.h similarity index 100% rename from extras/mini-os/include/linux/types.h rename to extras/mini-os-intree/include/linux/types.h diff --git a/extras/mini-os/include/lwipopts.h b/extras/mini-os-intree/include/lwipopts.h similarity index 100% rename from extras/mini-os/include/lwipopts.h rename to extras/mini-os-intree/include/lwipopts.h diff --git a/extras/mini-os/include/minios-external/README b/extras/mini-os-intree/include/minios-external/README similarity index 100% rename from extras/mini-os/include/minios-external/README rename to extras/mini-os-intree/include/minios-external/README diff --git a/extras/mini-os/include/minios-external/bsd-COPYRIGHT b/extras/mini-os-intree/include/minios-external/bsd-COPYRIGHT similarity index 100% rename from extras/mini-os/include/minios-external/bsd-COPYRIGHT rename to extras/mini-os-intree/include/minios-external/bsd-COPYRIGHT diff --git a/extras/mini-os/include/minios-external/bsd-queue.3 b/extras/mini-os-intree/include/minios-external/bsd-queue.3 similarity index 100% rename from extras/mini-os/include/minios-external/bsd-queue.3 rename to extras/mini-os-intree/include/minios-external/bsd-queue.3 diff --git a/extras/mini-os/include/minios-external/bsd-sys-queue-h-seddery b/extras/mini-os-intree/include/minios-external/bsd-sys-queue-h-seddery similarity index 100% rename from extras/mini-os/include/minios-external/bsd-sys-queue-h-seddery rename to extras/mini-os-intree/include/minios-external/bsd-sys-queue-h-seddery diff --git a/extras/mini-os/include/minios-external/bsd-sys-queue.h b/extras/mini-os-intree/include/minios-external/bsd-sys-queue.h similarity index 100% rename from extras/mini-os/include/minios-external/bsd-sys-queue.h rename to extras/mini-os-intree/include/minios-external/bsd-sys-queue.h diff --git a/extras/mini-os/include/mm.h b/extras/mini-os-intree/include/mm.h similarity index 100% rename from extras/mini-os/include/mm.h rename to extras/mini-os-intree/include/mm.h diff --git a/extras/mini-os/include/netfront.h b/extras/mini-os-intree/include/netfront.h similarity index 100% rename from extras/mini-os/include/netfront.h rename to extras/mini-os-intree/include/netfront.h diff --git a/extras/mini-os/include/pcifront.h b/extras/mini-os-intree/include/pcifront.h similarity index 100% rename from extras/mini-os/include/pcifront.h rename to extras/mini-os-intree/include/pcifront.h diff --git a/extras/mini-os/include/posix/arpa/inet.h b/extras/mini-os-intree/include/posix/arpa/inet.h similarity index 100% rename from extras/mini-os/include/posix/arpa/inet.h rename to extras/mini-os-intree/include/posix/arpa/inet.h diff --git a/extras/mini-os/include/posix/dirent.h b/extras/mini-os-intree/include/posix/dirent.h similarity index 100% rename from extras/mini-os/include/posix/dirent.h rename to extras/mini-os-intree/include/posix/dirent.h diff --git a/extras/mini-os/include/posix/err.h b/extras/mini-os-intree/include/posix/err.h similarity index 100% rename from extras/mini-os/include/posix/err.h rename to extras/mini-os-intree/include/posix/err.h diff --git a/extras/mini-os/include/posix/fcntl.h b/extras/mini-os-intree/include/posix/fcntl.h similarity index 100% rename from extras/mini-os/include/posix/fcntl.h rename to extras/mini-os-intree/include/posix/fcntl.h diff --git a/extras/mini-os/include/posix/limits.h b/extras/mini-os-intree/include/posix/limits.h similarity index 100% rename from extras/mini-os/include/posix/limits.h rename to extras/mini-os-intree/include/posix/limits.h diff --git a/extras/mini-os/include/posix/net/if.h b/extras/mini-os-intree/include/posix/net/if.h similarity index 100% rename from extras/mini-os/include/posix/net/if.h rename to extras/mini-os-intree/include/posix/net/if.h diff --git a/extras/mini-os/include/posix/netdb.h b/extras/mini-os-intree/include/posix/netdb.h similarity index 100% rename from extras/mini-os/include/posix/netdb.h rename to extras/mini-os-intree/include/posix/netdb.h diff --git a/extras/mini-os/include/posix/netinet/in.h b/extras/mini-os-intree/include/posix/netinet/in.h similarity index 100% rename from extras/mini-os/include/posix/netinet/in.h rename to extras/mini-os-intree/include/posix/netinet/in.h diff --git a/extras/mini-os/include/posix/netinet/tcp.h b/extras/mini-os-intree/include/posix/netinet/tcp.h similarity index 100% rename from extras/mini-os/include/posix/netinet/tcp.h rename to extras/mini-os-intree/include/posix/netinet/tcp.h diff --git a/extras/mini-os/include/posix/poll.h b/extras/mini-os-intree/include/posix/poll.h similarity index 100% rename from extras/mini-os/include/posix/poll.h rename to extras/mini-os-intree/include/posix/poll.h diff --git a/extras/mini-os/include/posix/pthread.h b/extras/mini-os-intree/include/posix/pthread.h similarity index 100% rename from extras/mini-os/include/posix/pthread.h rename to extras/mini-os-intree/include/posix/pthread.h diff --git a/extras/mini-os/include/posix/signal.h b/extras/mini-os-intree/include/posix/signal.h similarity index 100% rename from extras/mini-os/include/posix/signal.h rename to extras/mini-os-intree/include/posix/signal.h diff --git a/extras/mini-os/include/posix/stdlib.h b/extras/mini-os-intree/include/posix/stdlib.h similarity index 100% rename from extras/mini-os/include/posix/stdlib.h rename to extras/mini-os-intree/include/posix/stdlib.h diff --git a/extras/mini-os/include/posix/strings.h b/extras/mini-os-intree/include/posix/strings.h similarity index 100% rename from extras/mini-os/include/posix/strings.h rename to extras/mini-os-intree/include/posix/strings.h diff --git a/extras/mini-os/include/posix/sys/ioctl.h b/extras/mini-os-intree/include/posix/sys/ioctl.h similarity index 100% rename from extras/mini-os/include/posix/sys/ioctl.h rename to extras/mini-os-intree/include/posix/sys/ioctl.h diff --git a/extras/mini-os/include/posix/sys/mman.h b/extras/mini-os-intree/include/posix/sys/mman.h similarity index 100% rename from extras/mini-os/include/posix/sys/mman.h rename to extras/mini-os-intree/include/posix/sys/mman.h diff --git a/extras/mini-os/include/posix/sys/poll.h b/extras/mini-os-intree/include/posix/sys/poll.h similarity index 100% rename from extras/mini-os/include/posix/sys/poll.h rename to extras/mini-os-intree/include/posix/sys/poll.h diff --git a/extras/mini-os/include/posix/sys/select.h b/extras/mini-os-intree/include/posix/sys/select.h similarity index 100% rename from extras/mini-os/include/posix/sys/select.h rename to extras/mini-os-intree/include/posix/sys/select.h diff --git a/extras/mini-os/include/posix/sys/socket.h b/extras/mini-os-intree/include/posix/sys/socket.h similarity index 100% rename from extras/mini-os/include/posix/sys/socket.h rename to extras/mini-os-intree/include/posix/sys/socket.h diff --git a/extras/mini-os/include/posix/sys/stat.h b/extras/mini-os-intree/include/posix/sys/stat.h similarity index 100% rename from extras/mini-os/include/posix/sys/stat.h rename to extras/mini-os-intree/include/posix/sys/stat.h diff --git a/extras/mini-os/include/posix/syslog.h b/extras/mini-os-intree/include/posix/syslog.h similarity index 100% rename from extras/mini-os/include/posix/syslog.h rename to extras/mini-os-intree/include/posix/syslog.h diff --git a/extras/mini-os/include/posix/termios.h b/extras/mini-os-intree/include/posix/termios.h similarity index 100% rename from extras/mini-os/include/posix/termios.h rename to extras/mini-os-intree/include/posix/termios.h diff --git a/extras/mini-os/include/posix/time.h b/extras/mini-os-intree/include/posix/time.h similarity index 100% rename from extras/mini-os/include/posix/time.h rename to extras/mini-os-intree/include/posix/time.h diff --git a/extras/mini-os/include/posix/unistd.h b/extras/mini-os-intree/include/posix/unistd.h similarity index 100% rename from extras/mini-os/include/posix/unistd.h rename to extras/mini-os-intree/include/posix/unistd.h diff --git a/extras/mini-os/include/sched.h b/extras/mini-os-intree/include/sched.h similarity index 100% rename from extras/mini-os/include/sched.h rename to extras/mini-os-intree/include/sched.h diff --git a/extras/mini-os/include/semaphore.h b/extras/mini-os-intree/include/semaphore.h similarity index 100% rename from extras/mini-os/include/semaphore.h rename to extras/mini-os-intree/include/semaphore.h diff --git a/extras/mini-os/include/spinlock.h b/extras/mini-os-intree/include/spinlock.h similarity index 100% rename from extras/mini-os/include/spinlock.h rename to extras/mini-os-intree/include/spinlock.h diff --git a/extras/mini-os/include/sys/lock.h b/extras/mini-os-intree/include/sys/lock.h similarity index 100% rename from extras/mini-os/include/sys/lock.h rename to extras/mini-os-intree/include/sys/lock.h diff --git a/extras/mini-os/include/sys/time.h b/extras/mini-os-intree/include/sys/time.h similarity index 100% rename from extras/mini-os/include/sys/time.h rename to extras/mini-os-intree/include/sys/time.h diff --git a/extras/mini-os/include/time.h b/extras/mini-os-intree/include/time.h similarity index 100% rename from extras/mini-os/include/time.h rename to extras/mini-os-intree/include/time.h diff --git a/extras/mini-os/include/tpm_tis.h b/extras/mini-os-intree/include/tpm_tis.h similarity index 100% rename from extras/mini-os/include/tpm_tis.h rename to extras/mini-os-intree/include/tpm_tis.h diff --git a/extras/mini-os/include/tpmback.h b/extras/mini-os-intree/include/tpmback.h similarity index 100% rename from extras/mini-os/include/tpmback.h rename to extras/mini-os-intree/include/tpmback.h diff --git a/extras/mini-os/include/tpmfront.h b/extras/mini-os-intree/include/tpmfront.h similarity index 100% rename from extras/mini-os/include/tpmfront.h rename to extras/mini-os-intree/include/tpmfront.h diff --git a/extras/mini-os/include/types.h b/extras/mini-os-intree/include/types.h similarity index 100% rename from extras/mini-os/include/types.h rename to extras/mini-os-intree/include/types.h diff --git a/extras/mini-os/include/wait.h b/extras/mini-os-intree/include/wait.h similarity index 100% rename from extras/mini-os/include/wait.h rename to extras/mini-os-intree/include/wait.h diff --git a/extras/mini-os/include/waittypes.h b/extras/mini-os-intree/include/waittypes.h similarity index 100% rename from extras/mini-os/include/waittypes.h rename to extras/mini-os-intree/include/waittypes.h diff --git a/extras/mini-os/include/x86/arch_endian.h b/extras/mini-os-intree/include/x86/arch_endian.h similarity index 100% rename from extras/mini-os/include/x86/arch_endian.h rename to extras/mini-os-intree/include/x86/arch_endian.h diff --git a/extras/mini-os/include/x86/arch_limits.h b/extras/mini-os-intree/include/x86/arch_limits.h similarity index 100% rename from extras/mini-os/include/x86/arch_limits.h rename to extras/mini-os-intree/include/x86/arch_limits.h diff --git a/extras/mini-os/include/x86/arch_mm.h b/extras/mini-os-intree/include/x86/arch_mm.h similarity index 100% rename from extras/mini-os/include/x86/arch_mm.h rename to extras/mini-os-intree/include/x86/arch_mm.h diff --git a/extras/mini-os/include/x86/arch_sched.h b/extras/mini-os-intree/include/x86/arch_sched.h similarity index 100% rename from extras/mini-os/include/x86/arch_sched.h rename to extras/mini-os-intree/include/x86/arch_sched.h diff --git a/extras/mini-os/include/x86/arch_spinlock.h b/extras/mini-os-intree/include/x86/arch_spinlock.h similarity index 100% rename from extras/mini-os/include/x86/arch_spinlock.h rename to extras/mini-os-intree/include/x86/arch_spinlock.h diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os-intree/include/x86/os.h similarity index 100% rename from extras/mini-os/include/x86/os.h rename to extras/mini-os-intree/include/x86/os.h diff --git a/extras/mini-os/include/x86/traps.h b/extras/mini-os-intree/include/x86/traps.h similarity index 100% rename from extras/mini-os/include/x86/traps.h rename to extras/mini-os-intree/include/x86/traps.h diff --git a/extras/mini-os/include/x86/x86_32/arch_wordsize.h b/extras/mini-os-intree/include/x86/x86_32/arch_wordsize.h similarity index 100% rename from extras/mini-os/include/x86/x86_32/arch_wordsize.h rename to extras/mini-os-intree/include/x86/x86_32/arch_wordsize.h diff --git a/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h b/extras/mini-os-intree/include/x86/x86_32/hypercall-x86_32.h similarity index 100% rename from extras/mini-os/include/x86/x86_32/hypercall-x86_32.h rename to extras/mini-os-intree/include/x86/x86_32/hypercall-x86_32.h diff --git a/extras/mini-os/include/x86/x86_64/arch_wordsize.h b/extras/mini-os-intree/include/x86/x86_64/arch_wordsize.h similarity index 100% rename from extras/mini-os/include/x86/x86_64/arch_wordsize.h rename to extras/mini-os-intree/include/x86/x86_64/arch_wordsize.h diff --git a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h b/extras/mini-os-intree/include/x86/x86_64/hypercall-x86_64.h similarity index 100% rename from extras/mini-os/include/x86/x86_64/hypercall-x86_64.h rename to extras/mini-os-intree/include/x86/x86_64/hypercall-x86_64.h diff --git a/extras/mini-os/include/xen/COPYING b/extras/mini-os-intree/include/xen/COPYING similarity index 100% rename from extras/mini-os/include/xen/COPYING rename to extras/mini-os-intree/include/xen/COPYING diff --git a/extras/mini-os/include/xen/arch-arm.h b/extras/mini-os-intree/include/xen/arch-arm.h similarity index 100% rename from extras/mini-os/include/xen/arch-arm.h rename to extras/mini-os-intree/include/xen/arch-arm.h diff --git a/extras/mini-os/include/xen/arch-arm/hvm/save.h b/extras/mini-os-intree/include/xen/arch-arm/hvm/save.h similarity index 100% rename from extras/mini-os/include/xen/arch-arm/hvm/save.h rename to extras/mini-os-intree/include/xen/arch-arm/hvm/save.h diff --git a/extras/mini-os/include/xen/arch-x86/cpuid.h b/extras/mini-os-intree/include/xen/arch-x86/cpuid.h similarity index 100% rename from extras/mini-os/include/xen/arch-x86/cpuid.h rename to extras/mini-os-intree/include/xen/arch-x86/cpuid.h diff --git a/extras/mini-os/include/xen/arch-x86/hvm/save.h b/extras/mini-os-intree/include/xen/arch-x86/hvm/save.h similarity index 100% rename from extras/mini-os/include/xen/arch-x86/hvm/save.h rename to extras/mini-os-intree/include/xen/arch-x86/hvm/save.h diff --git a/extras/mini-os/include/xen/arch-x86/xen-mca.h b/extras/mini-os-intree/include/xen/arch-x86/xen-mca.h similarity index 100% rename from extras/mini-os/include/xen/arch-x86/xen-mca.h rename to extras/mini-os-intree/include/xen/arch-x86/xen-mca.h diff --git a/extras/mini-os/include/xen/arch-x86/xen-x86_32.h b/extras/mini-os-intree/include/xen/arch-x86/xen-x86_32.h similarity index 100% rename from extras/mini-os/include/xen/arch-x86/xen-x86_32.h rename to extras/mini-os-intree/include/xen/arch-x86/xen-x86_32.h diff --git a/extras/mini-os/include/xen/arch-x86/xen-x86_64.h b/extras/mini-os-intree/include/xen/arch-x86/xen-x86_64.h similarity index 100% rename from extras/mini-os/include/xen/arch-x86/xen-x86_64.h rename to extras/mini-os-intree/include/xen/arch-x86/xen-x86_64.h diff --git a/extras/mini-os/include/xen/arch-x86/xen.h b/extras/mini-os-intree/include/xen/arch-x86/xen.h similarity index 100% rename from extras/mini-os/include/xen/arch-x86/xen.h rename to extras/mini-os-intree/include/xen/arch-x86/xen.h diff --git a/extras/mini-os/include/xen/arch-x86_32.h b/extras/mini-os-intree/include/xen/arch-x86_32.h similarity index 100% rename from extras/mini-os/include/xen/arch-x86_32.h rename to extras/mini-os-intree/include/xen/arch-x86_32.h diff --git a/extras/mini-os/include/xen/arch-x86_64.h b/extras/mini-os-intree/include/xen/arch-x86_64.h similarity index 100% rename from extras/mini-os/include/xen/arch-x86_64.h rename to extras/mini-os-intree/include/xen/arch-x86_64.h diff --git a/extras/mini-os/include/xen/callback.h b/extras/mini-os-intree/include/xen/callback.h similarity index 100% rename from extras/mini-os/include/xen/callback.h rename to extras/mini-os-intree/include/xen/callback.h diff --git a/extras/mini-os/include/xen/dom0_ops.h b/extras/mini-os-intree/include/xen/dom0_ops.h similarity index 100% rename from extras/mini-os/include/xen/dom0_ops.h rename to extras/mini-os-intree/include/xen/dom0_ops.h diff --git a/extras/mini-os/include/xen/domctl.h b/extras/mini-os-intree/include/xen/domctl.h similarity index 100% rename from extras/mini-os/include/xen/domctl.h rename to extras/mini-os-intree/include/xen/domctl.h diff --git a/extras/mini-os/include/xen/elfnote.h b/extras/mini-os-intree/include/xen/elfnote.h similarity index 100% rename from extras/mini-os/include/xen/elfnote.h rename to extras/mini-os-intree/include/xen/elfnote.h diff --git a/extras/mini-os/include/xen/event_channel.h b/extras/mini-os-intree/include/xen/event_channel.h similarity index 100% rename from extras/mini-os/include/xen/event_channel.h rename to extras/mini-os-intree/include/xen/event_channel.h diff --git a/extras/mini-os/include/xen/features.h b/extras/mini-os-intree/include/xen/features.h similarity index 100% rename from extras/mini-os/include/xen/features.h rename to extras/mini-os-intree/include/xen/features.h diff --git a/extras/mini-os/include/xen/gcov.h b/extras/mini-os-intree/include/xen/gcov.h similarity index 100% rename from extras/mini-os/include/xen/gcov.h rename to extras/mini-os-intree/include/xen/gcov.h diff --git a/extras/mini-os/include/xen/grant_table.h b/extras/mini-os-intree/include/xen/grant_table.h similarity index 100% rename from extras/mini-os/include/xen/grant_table.h rename to extras/mini-os-intree/include/xen/grant_table.h diff --git a/extras/mini-os/include/xen/hvm/e820.h b/extras/mini-os-intree/include/xen/hvm/e820.h similarity index 100% rename from extras/mini-os/include/xen/hvm/e820.h rename to extras/mini-os-intree/include/xen/hvm/e820.h diff --git a/extras/mini-os/include/xen/hvm/hvm_info_table.h b/extras/mini-os-intree/include/xen/hvm/hvm_info_table.h similarity index 100% rename from extras/mini-os/include/xen/hvm/hvm_info_table.h rename to extras/mini-os-intree/include/xen/hvm/hvm_info_table.h diff --git a/extras/mini-os/include/xen/hvm/hvm_op.h b/extras/mini-os-intree/include/xen/hvm/hvm_op.h similarity index 100% rename from extras/mini-os/include/xen/hvm/hvm_op.h rename to extras/mini-os-intree/include/xen/hvm/hvm_op.h diff --git a/extras/mini-os/include/xen/hvm/hvm_xs_strings.h b/extras/mini-os-intree/include/xen/hvm/hvm_xs_strings.h similarity index 100% rename from extras/mini-os/include/xen/hvm/hvm_xs_strings.h rename to extras/mini-os-intree/include/xen/hvm/hvm_xs_strings.h diff --git a/extras/mini-os/include/xen/hvm/ioreq.h b/extras/mini-os-intree/include/xen/hvm/ioreq.h similarity index 100% rename from extras/mini-os/include/xen/hvm/ioreq.h rename to extras/mini-os-intree/include/xen/hvm/ioreq.h diff --git a/extras/mini-os/include/xen/hvm/params.h b/extras/mini-os-intree/include/xen/hvm/params.h similarity index 100% rename from extras/mini-os/include/xen/hvm/params.h rename to extras/mini-os-intree/include/xen/hvm/params.h diff --git a/extras/mini-os/include/xen/hvm/pvdrivers.h b/extras/mini-os-intree/include/xen/hvm/pvdrivers.h similarity index 100% rename from extras/mini-os/include/xen/hvm/pvdrivers.h rename to extras/mini-os-intree/include/xen/hvm/pvdrivers.h diff --git a/extras/mini-os/include/xen/hvm/save.h b/extras/mini-os-intree/include/xen/hvm/save.h similarity index 100% rename from extras/mini-os/include/xen/hvm/save.h rename to extras/mini-os-intree/include/xen/hvm/save.h diff --git a/extras/mini-os/include/xen/io/blkif.h b/extras/mini-os-intree/include/xen/io/blkif.h similarity index 100% rename from extras/mini-os/include/xen/io/blkif.h rename to extras/mini-os-intree/include/xen/io/blkif.h diff --git a/extras/mini-os/include/xen/io/console.h b/extras/mini-os-intree/include/xen/io/console.h similarity index 100% rename from extras/mini-os/include/xen/io/console.h rename to extras/mini-os-intree/include/xen/io/console.h diff --git a/extras/mini-os/include/xen/io/fbif.h b/extras/mini-os-intree/include/xen/io/fbif.h similarity index 100% rename from extras/mini-os/include/xen/io/fbif.h rename to extras/mini-os-intree/include/xen/io/fbif.h diff --git a/extras/mini-os/include/xen/io/fsif.h b/extras/mini-os-intree/include/xen/io/fsif.h similarity index 100% rename from extras/mini-os/include/xen/io/fsif.h rename to extras/mini-os-intree/include/xen/io/fsif.h diff --git a/extras/mini-os/include/xen/io/kbdif.h b/extras/mini-os-intree/include/xen/io/kbdif.h similarity index 100% rename from extras/mini-os/include/xen/io/kbdif.h rename to extras/mini-os-intree/include/xen/io/kbdif.h diff --git a/extras/mini-os/include/xen/io/libxenvchan.h b/extras/mini-os-intree/include/xen/io/libxenvchan.h similarity index 100% rename from extras/mini-os/include/xen/io/libxenvchan.h rename to extras/mini-os-intree/include/xen/io/libxenvchan.h diff --git a/extras/mini-os/include/xen/io/netif.h b/extras/mini-os-intree/include/xen/io/netif.h similarity index 100% rename from extras/mini-os/include/xen/io/netif.h rename to extras/mini-os-intree/include/xen/io/netif.h diff --git a/extras/mini-os/include/xen/io/pciif.h b/extras/mini-os-intree/include/xen/io/pciif.h similarity index 100% rename from extras/mini-os/include/xen/io/pciif.h rename to extras/mini-os-intree/include/xen/io/pciif.h diff --git a/extras/mini-os/include/xen/io/protocols.h b/extras/mini-os-intree/include/xen/io/protocols.h similarity index 100% rename from extras/mini-os/include/xen/io/protocols.h rename to extras/mini-os-intree/include/xen/io/protocols.h diff --git a/extras/mini-os/include/xen/io/ring.h b/extras/mini-os-intree/include/xen/io/ring.h similarity index 100% rename from extras/mini-os/include/xen/io/ring.h rename to extras/mini-os-intree/include/xen/io/ring.h diff --git a/extras/mini-os/include/xen/io/tpmif.h b/extras/mini-os-intree/include/xen/io/tpmif.h similarity index 100% rename from extras/mini-os/include/xen/io/tpmif.h rename to extras/mini-os-intree/include/xen/io/tpmif.h diff --git a/extras/mini-os/include/xen/io/usbif.h b/extras/mini-os-intree/include/xen/io/usbif.h similarity index 100% rename from extras/mini-os/include/xen/io/usbif.h rename to extras/mini-os-intree/include/xen/io/usbif.h diff --git a/extras/mini-os/include/xen/io/vscsiif.h b/extras/mini-os-intree/include/xen/io/vscsiif.h similarity index 100% rename from extras/mini-os/include/xen/io/vscsiif.h rename to extras/mini-os-intree/include/xen/io/vscsiif.h diff --git a/extras/mini-os/include/xen/io/xenbus.h b/extras/mini-os-intree/include/xen/io/xenbus.h similarity index 100% rename from extras/mini-os/include/xen/io/xenbus.h rename to extras/mini-os-intree/include/xen/io/xenbus.h diff --git a/extras/mini-os/include/xen/io/xs_wire.h b/extras/mini-os-intree/include/xen/io/xs_wire.h similarity index 100% rename from extras/mini-os/include/xen/io/xs_wire.h rename to extras/mini-os-intree/include/xen/io/xs_wire.h diff --git a/extras/mini-os/include/xen/kexec.h b/extras/mini-os-intree/include/xen/kexec.h similarity index 100% rename from extras/mini-os/include/xen/kexec.h rename to extras/mini-os-intree/include/xen/kexec.h diff --git a/extras/mini-os/include/xen/mem_event.h b/extras/mini-os-intree/include/xen/mem_event.h similarity index 100% rename from extras/mini-os/include/xen/mem_event.h rename to extras/mini-os-intree/include/xen/mem_event.h diff --git a/extras/mini-os/include/xen/memory.h b/extras/mini-os-intree/include/xen/memory.h similarity index 100% rename from extras/mini-os/include/xen/memory.h rename to extras/mini-os-intree/include/xen/memory.h diff --git a/extras/mini-os/include/xen/nmi.h b/extras/mini-os-intree/include/xen/nmi.h similarity index 100% rename from extras/mini-os/include/xen/nmi.h rename to extras/mini-os-intree/include/xen/nmi.h diff --git a/extras/mini-os/include/xen/physdev.h b/extras/mini-os-intree/include/xen/physdev.h similarity index 100% rename from extras/mini-os/include/xen/physdev.h rename to extras/mini-os-intree/include/xen/physdev.h diff --git a/extras/mini-os/include/xen/platform.h b/extras/mini-os-intree/include/xen/platform.h similarity index 100% rename from extras/mini-os/include/xen/platform.h rename to extras/mini-os-intree/include/xen/platform.h diff --git a/extras/mini-os/include/xen/sched.h b/extras/mini-os-intree/include/xen/sched.h similarity index 100% rename from extras/mini-os/include/xen/sched.h rename to extras/mini-os-intree/include/xen/sched.h diff --git a/extras/mini-os/include/xen/sysctl.h b/extras/mini-os-intree/include/xen/sysctl.h similarity index 100% rename from extras/mini-os/include/xen/sysctl.h rename to extras/mini-os-intree/include/xen/sysctl.h diff --git a/extras/mini-os/include/xen/tmem.h b/extras/mini-os-intree/include/xen/tmem.h similarity index 100% rename from extras/mini-os/include/xen/tmem.h rename to extras/mini-os-intree/include/xen/tmem.h diff --git a/extras/mini-os/include/xen/trace.h b/extras/mini-os-intree/include/xen/trace.h similarity index 100% rename from extras/mini-os/include/xen/trace.h rename to extras/mini-os-intree/include/xen/trace.h diff --git a/extras/mini-os/include/xen/vcpu.h b/extras/mini-os-intree/include/xen/vcpu.h similarity index 100% rename from extras/mini-os/include/xen/vcpu.h rename to extras/mini-os-intree/include/xen/vcpu.h diff --git a/extras/mini-os/include/xen/version.h b/extras/mini-os-intree/include/xen/version.h similarity index 100% rename from extras/mini-os/include/xen/version.h rename to extras/mini-os-intree/include/xen/version.h diff --git a/extras/mini-os/include/xen/xen-compat.h b/extras/mini-os-intree/include/xen/xen-compat.h similarity index 100% rename from extras/mini-os/include/xen/xen-compat.h rename to extras/mini-os-intree/include/xen/xen-compat.h diff --git a/extras/mini-os/include/xen/xen.h b/extras/mini-os-intree/include/xen/xen.h similarity index 100% rename from extras/mini-os/include/xen/xen.h rename to extras/mini-os-intree/include/xen/xen.h diff --git a/extras/mini-os/include/xen/xencomm.h b/extras/mini-os-intree/include/xen/xencomm.h similarity index 100% rename from extras/mini-os/include/xen/xencomm.h rename to extras/mini-os-intree/include/xen/xencomm.h diff --git a/extras/mini-os/include/xen/xenoprof.h b/extras/mini-os-intree/include/xen/xenoprof.h similarity index 100% rename from extras/mini-os/include/xen/xenoprof.h rename to extras/mini-os-intree/include/xen/xenoprof.h diff --git a/extras/mini-os/include/xen/xsm/flask_op.h b/extras/mini-os-intree/include/xen/xsm/flask_op.h similarity index 100% rename from extras/mini-os/include/xen/xsm/flask_op.h rename to extras/mini-os-intree/include/xen/xsm/flask_op.h diff --git a/extras/mini-os/include/xenbus.h b/extras/mini-os-intree/include/xenbus.h similarity index 100% rename from extras/mini-os/include/xenbus.h rename to extras/mini-os-intree/include/xenbus.h diff --git a/extras/mini-os/include/xmalloc.h b/extras/mini-os-intree/include/xmalloc.h similarity index 100% rename from extras/mini-os/include/xmalloc.h rename to extras/mini-os-intree/include/xmalloc.h diff --git a/extras/mini-os/kernel.c b/extras/mini-os-intree/kernel.c similarity index 100% rename from extras/mini-os/kernel.c rename to extras/mini-os-intree/kernel.c diff --git a/extras/mini-os/lib/ctype.c b/extras/mini-os-intree/lib/ctype.c similarity index 100% rename from extras/mini-os/lib/ctype.c rename to extras/mini-os-intree/lib/ctype.c diff --git a/extras/mini-os/lib/math.c b/extras/mini-os-intree/lib/math.c similarity index 100% rename from extras/mini-os/lib/math.c rename to extras/mini-os-intree/lib/math.c diff --git a/extras/mini-os/lib/printf.c b/extras/mini-os-intree/lib/printf.c similarity index 100% rename from extras/mini-os/lib/printf.c rename to extras/mini-os-intree/lib/printf.c diff --git a/extras/mini-os/lib/stack_chk_fail.c b/extras/mini-os-intree/lib/stack_chk_fail.c similarity index 100% rename from extras/mini-os/lib/stack_chk_fail.c rename to extras/mini-os-intree/lib/stack_chk_fail.c diff --git a/extras/mini-os/lib/string.c b/extras/mini-os-intree/lib/string.c similarity index 100% rename from extras/mini-os/lib/string.c rename to extras/mini-os-intree/lib/string.c diff --git a/extras/mini-os/lib/sys.c b/extras/mini-os-intree/lib/sys.c similarity index 100% rename from extras/mini-os/lib/sys.c rename to extras/mini-os-intree/lib/sys.c diff --git a/extras/mini-os/lib/xmalloc.c b/extras/mini-os-intree/lib/xmalloc.c similarity index 100% rename from extras/mini-os/lib/xmalloc.c rename to extras/mini-os-intree/lib/xmalloc.c diff --git a/extras/mini-os/lib/xs.c b/extras/mini-os-intree/lib/xs.c similarity index 100% rename from extras/mini-os/lib/xs.c rename to extras/mini-os-intree/lib/xs.c diff --git a/extras/mini-os/lock.c b/extras/mini-os-intree/lock.c similarity index 100% rename from extras/mini-os/lock.c rename to extras/mini-os-intree/lock.c diff --git a/extras/mini-os/lwip-arch.c b/extras/mini-os-intree/lwip-arch.c similarity index 100% rename from extras/mini-os/lwip-arch.c rename to extras/mini-os-intree/lwip-arch.c diff --git a/extras/mini-os/lwip-net.c b/extras/mini-os-intree/lwip-net.c similarity index 100% rename from extras/mini-os/lwip-net.c rename to extras/mini-os-intree/lwip-net.c diff --git a/extras/mini-os/main.c b/extras/mini-os-intree/main.c similarity index 100% rename from extras/mini-os/main.c rename to extras/mini-os-intree/main.c diff --git a/extras/mini-os/minios.mk b/extras/mini-os-intree/minios.mk similarity index 100% rename from extras/mini-os/minios.mk rename to extras/mini-os-intree/minios.mk diff --git a/extras/mini-os/mm.c b/extras/mini-os-intree/mm.c similarity index 100% rename from extras/mini-os/mm.c rename to extras/mini-os-intree/mm.c diff --git a/extras/mini-os/netfront.c b/extras/mini-os-intree/netfront.c similarity index 100% rename from extras/mini-os/netfront.c rename to extras/mini-os-intree/netfront.c diff --git a/extras/mini-os/pcifront.c b/extras/mini-os-intree/pcifront.c similarity index 100% rename from extras/mini-os/pcifront.c rename to extras/mini-os-intree/pcifront.c diff --git a/extras/mini-os/sched.c b/extras/mini-os-intree/sched.c similarity index 100% rename from extras/mini-os/sched.c rename to extras/mini-os-intree/sched.c diff --git a/extras/mini-os/test.c b/extras/mini-os-intree/test.c similarity index 100% rename from extras/mini-os/test.c rename to extras/mini-os-intree/test.c diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os-intree/tpm_tis.c similarity index 100% rename from extras/mini-os/tpm_tis.c rename to extras/mini-os-intree/tpm_tis.c diff --git a/extras/mini-os/tpmback.c b/extras/mini-os-intree/tpmback.c similarity index 100% rename from extras/mini-os/tpmback.c rename to extras/mini-os-intree/tpmback.c diff --git a/extras/mini-os/tpmfront.c b/extras/mini-os-intree/tpmfront.c similarity index 100% rename from extras/mini-os/tpmfront.c rename to extras/mini-os-intree/tpmfront.c diff --git a/extras/mini-os/xenbus/xenbus.c b/extras/mini-os-intree/xenbus/xenbus.c similarity index 100% rename from extras/mini-os/xenbus/xenbus.c rename to extras/mini-os-intree/xenbus/xenbus.c diff --git a/stubdom/Makefile b/stubdom/Makefile index 6e6876b1aa..1a1f26330b 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -1,6 +1,10 @@ XEN_ROOT = $(CURDIR)/.. MINI_OS = $(XEN_ROOT)/extras/mini-os +ifeq ($(wildcard $(MINI_OS)/Config.mk),) +$(error Please run `make mini-os-dir' in top-level directory) +endif + export XEN_OS=MiniOS export stubdom=y diff --git a/tools/misc/mktarball b/tools/misc/mktarball index aad10965e3..73282b55b7 100755 --- a/tools/misc/mktarball +++ b/tools/misc/mktarball @@ -6,7 +6,7 @@ set -ex function git_archive_into { - mkdir "$2" + mkdir -p "$2" git --git-dir="$1"/.git \ archive --format=tar HEAD | \ @@ -33,6 +33,8 @@ git_archive_into $xen_root/tools/qemu-xen-dir-remote $tdir/xen-$desc/tools/qemu- git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote $tdir/xen-$desc/tools/qemu-xen-traditional +git_archive_into $xen_root/extras/mini-os-remote $tdir/xen-$desc/extras/mini-os + GZIP=-9v tar cz -f $xen_root/dist/xen-$desc.tar.gz -C $tdir xen-$desc echo "Source tarball in $xen_root/dist/xen-$desc.tar.gz" -- 2.30.2